Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

binlog: fix show pump/drainer status (#44764) #44993

Merged
merged 4 commits into from
Dec 24, 2024
Merged

binlog: fix show pump/drainer status (#44764) #44993

merged 4 commits into from
Dec 24, 2024

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #44764

What problem does this PR solve?

Issue Number: ref #42643

Problem Summary:

What is changed and how it works?

In the past code we directly use tidb's global config path to create etcd registry. After this PR we use binlog client's etcd registry to do the following staff. Binlog client will update etcd urls in time.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)

Side effects

  • None

Documentation

  • None

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

@ti-chi-bot ti-chi-bot mentioned this pull request Jun 27, 2023
Merged
3 tasks
@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR. labels Jun 27, 2023
@ti-chi-bot ti-chi-bot bot added release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/cherry-pick-not-approved labels Jun 27, 2023
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Jun 27, 2023
@codecov Codecov
Copy link

codecov bot commented Feb 6, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 25.00000% with 15 lines in your changes missing coverage. Please review.

Please upload report for BASE (release-6.5@464dc82). Learn more about missing BASE report.

Additional details and impacted files 
@@               Coverage Diff                @@
##             release-6.5     #44993   +/-   ##
================================================
  Coverage               ?   78.9302%           
================================================
  Files                  ?       1098           
  Lines                  ?     394485           
  Branches               ?          0           
================================================
  Hits                   ?     311368           
  Misses                 ?      67765           
  Partials               ?      15352

@kennytm
Copy link
Contributor

kennytm commented Dec 24, 2024

PTAL @GMHDBJD it seems this cherry-pick is missed

GMHDBJD
GMHDBJD approved these changes Dec 24, 2024
View reviewed changes
Copy link
Contributor

@GMHDBJD GMHDBJD left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ti-chi-bot ti-chi-bot bot added approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Dec 24, 2024
@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Dec 24, 2024
@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Dec 24, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-12-24 09:17:12.869336564 +0000 UTC m=+1553222.958139100: ☑️ agreed by GMHDBJD.
  • 2024-12-24 09:38:20.218849692 +0000 UTC m=+1554490.307652234: ☑️ agreed by lance6716.

Benjamin2037
Benjamin2037 approved these changes Dec 24, 2024
View reviewed changes
Copy link
Collaborator

@Benjamin2037 Benjamin2037 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Dec 24, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Benjamin2037, GMHDBJD, lance6716

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kennytm
Copy link
Contributor

kennytm commented Dec 24, 2024

/retest

        	Error Trace:	tests/realtikvtest/testkit.go:109
        	            				tests/realtikvtest/testkit.go:84
        	            				tests/realtikvtest/addindextest/add_index_test.go:32
        	            				tests/realtikvtest/addindextest/multi_schema_change_test.go:22
        	            				tests/realtikvtest/addindextest/multi_schema_change_test.go:49
        	Error:      	Received unexpected error:
        	            	rpc error: code = Unknown desc = [PD:tso:ErrGenerateTimestamp]generate timestamp failed, requested pd is not leader of cluster

    testkit.go:132: 
        	Error Trace:	testkit/testkit.go:132
        	            				testkit/testkit.go:125
        	            				tests/realtikvtest/addindextest/add_index_test.go:34
        	            				tests/realtikvtest/addindextest/multi_schema_change_test.go:22
        	            				tests/realtikvtest/addindextest/multi_schema_change_test.go:55
        	Error:      	Received unexpected error:
        	            	[domain:8243]no leader

@ti-chi-bot ti-chi-bot bot merged commit e83dbdd into pingcap:release-6.5 Dec 24, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GMHDBJD GMHDBJD GMHDBJD approved these changes

@Benjamin2037 Benjamin2037 Benjamin2037 approved these changes

@lance6716 lance6716 lance6716 approved these changes

Assignees

@lichunzhu lichunzhu

Labels
approved cherry-pick-approved Cherry pick PR approved by release team. lgtm release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@ti-chi-bot @kennytm @lance6716 @Benjamin2037 @GMHDBJD @lichunzhu